merge trunk
authorKenichi Handa <handa@etlken>
Tue, 20 Apr 2010 04:24:33 +0000 (13:24 +0900)
committerKenichi Handa <handa@etlken>
Tue, 20 Apr 2010 04:24:33 +0000 (13:24 +0900)

Trivial merge